Unify Worker Environment Variables systemd/k8s #23197
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agrare
commented
Sep 20, 2024
| @@ -5,7 +5,6 @@ module DeploymentPerWorker | |||
| def create_container_objects | |||
| ContainerOrchestrator.new.create_deployment(worker_deployment_name) do |definition| | |||
| configure_worker_deployment(definition, 1) | |||
| definition[:spec][:template][:spec][:containers].first[:env] << {:name => "EMS_ID", :value => self.class.ems_id_from_queue_name(queue_name)} | |||
There was a problem hiding this comment.
This is what bothered me originally, we already have EMS_ID env var handling for systemd in the per_ems_worker_mixin so I thought we should be able to let the worker class define this rather than DeploymentPerWorker
agrare
changed the title
Merged
1 task
agrare
force-pushed
the
refactor_worker_environment_variables
branch
5 times, most recently
from
9a565b6
to
0e017ce
Compare
Fryguy
approved these changes
Sep 24, 2024
|
This is great! |
agrare
force-pushed
the
refactor_worker_environment_variables
branch
from
0e017ce
to
55732aa
Compare
agrare
force-pushed
the
refactor_worker_environment_variables
branch
2 times, most recently
from
f2fdad8
to
6524d81
Compare
Handling of worker environment variables was spread across a number of different locations and in a number of cases had to be duplicated for systemd/kubernetes. This adds a common `MiqWorker#environment_variables` method that applies to all runtime platforms, as well as specific systemd/container_environment_variables which are merged in depending on the runtime environment.
agrare
force-pushed
the
refactor_worker_environment_variables
branch
from
6524d81
to
80d99c9
Compare
|
Checked commit agrare@80d99c9 with ruby 3.1.5, rubocop 1.56.3, haml-lint 0.51.0, and yamllint |
agrare
changed the title
|
Okay I've tested this on openshift/appliances/local-development-environment and all runs correctly, taking out of WIP |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Handling of worker environment variables was spread across a number of different locations and in a number of cases had to be duplicated for systemd/kubernetes.
This adds a common
MiqWorker#environment_variablesmethod that applies to all runtime platforms, as well as specificsystemd/container_environment_variables which are merged in depending on the runtime environment.
TODO:
Live test of standard workers, provider workers, opentofu-runner on:
Dependent: